Revert abd95b6..66c8da0

This rolls back to commit abd95b6387b67ac058f0a12c1d02c1b7686a571e.
Revert 7932865..ce7bd11

This rolls back to commit 7932865865cedace11452da9fef7374155204d16.
Functions Written