Added a bunch of stuff including addressing