Made base location work correctly :D

Still haven't tested this fully