Cleaned up, worked on placing & transfer

Part of the code was rendered redundant thanks to the spare/request
system.