Add some prototypes
Move some stuff